broken if/else added