edited these according to Steves modifications