initial commit after changes to work without package seetings