Changed dependency numbers to be more flexible