Alex - a bunch of changes..