Final commit fix

Based on validation