Fixed RMI Issue; Implemented Locking