Some changes... not sure if working state yet