added some crude stuff