compacted code
added