A few upadtes
Updated style