adding in elements from non compass version
adding elements from non compass version
changes