reverted a few things