Seems to be working after quick testing.
Good job m8!