Comments + better hook