Added online check, better naming and stuff