All enhancements done, just need to debug update