re-added other things, ready for merge