merged Ashley's changes from tiris_tangent