cleaned up working and link