Optimization

Bug Fixes