små endringer + focus greia de ;)