small changes NEED TEST WHEN ISSUE 1 FIXED