implemented small features