FIXING SELECT AHHH