removed it and refactored this section a bit