Found restrictive logic and commented in -> TO FIX