Implement Fabian's suggestions