changed static classe to non-static classes