added logs and stuff