Just pushing some changes here while I remember :)