fixed previous stuff