Added better hook