fixes before real project