Reverted to original structure as it wasn't working