Added stuff removed in last commit