redone everything