made few awesome changes