Almost there..
adding some final touches