SOme Optimizations