added spring and guard again for running on Ubuntu and MacOS