kinda fix conditional statements