change statics to package (working)