updated code and if statement based on the Organisation