updated samples03-16 with new select logic