simplified and added packages