Added another main feature
Improved performance