Reverted to previous code. WTH happened?