updated with positioning fixes