reverted some stuff for testing purposes