big changes before deadline :o