(2) Need to fix the synchronized methods