Updated method to be synchronized
Various things. Forgot to commit for a bit...