Working

fixed const declarations