Reverted code back (still doesn't work)