adding stuff from rasp
merge