Added for-in and conditionals