Fixed optional package stuff
simplified
stuff