added most of 04 added