Added fixed mechanic + "flowing" code refactoring