remake some things