more changes...not working yet