* added additional changes that forgot on first commit