initial commit
note and user part improved