added last things to first version