Added features that were not actually commited (oops!).