Removed dup code#2