Improved entire system by adding some features that were missing.