Minor changes to get