Started improving based on feedback