refactor dupa kupa