third iteration of changes