removed conditonal