Some optimization and work on Light Updates