Made this work with karel's stuff