Reverted a few changes