Ok but be cleaner