Added custom select functionality, not tested