updates for initial release needs modified back to generic