updated the alex_working branch