sort of working again
remove duplication with initialization