added updated working for real this time