reverted earlier changes, should be finalized now