adding everything; it should work by now