changes to ssd_alloc
merge changes