changes reverted 1 and 2