Just making sure everything is in place correctly