Moved to using java