i changed almost everything here...