cleaned up code, removed volume stuff