fixed swp and stuff