Changes to make it presentable