More positioning logic added.