rework of tefap and basic order beans and jpas