need to solver some exceptions yet