updates to make more plugable