added Albany 2006 general and cleaned up