edited these 2 procedures