Updated with stuffs