reverted alot of changes