reverted to original functionality