Small Modifications
optimizations