added some stashed changes