organizing the code more; added more deps;