Added extra_package_name parameter
Removed ma non printing chars
Realigned to stack skeleton