updated a lot
updated transitions