removed static as this introduces problems for multiple instances