Changed the issues after a review from Bert