Added some new liness to make code look better