a little bit of other stuffs before merge