Cleaned up. Fixed dependency bug.