initial version without major build problems