started work on java side