updated package, cleaned solution