Added Vasilis temp work