Updated to current spatial
Fixed scala syntax bug