restructuralized for PilsFree needs