Added position vectors with some robustness