Tried to handle some issue 3 problems but failed more or less