Alternative solution where we don't remove the class