worked on lbapi for better data integrity