Selection feature is now working