added various stuffs