added some code, not debug yet
added some code, not debug yet