adjusted done() methods
solved lowercase problem with packages