[UPDATE] fixed some imports and removed debugging