thanks to all feedback added