Reverted to use only one section