merge
drawing stuff added