Some optimizations for later... :)
Some optimizations for later... :)