merge this over
Further development