Second commit

Performance enhancements