Added code from current project