Simplify the operators
Play it safe and introduce better locking mechanisms