WIP Modifications on package