crucial commit :P - work in progress