converting to modernised version