Small Improvements. Requires some extra additions.