changing code structure a little bit