Minor changes on the sub