more changes devise etc