Adding changes made on sptcloud.  I cannot push from there from some reason... :(