added more select stuff