Second commit after optimization