Refactored Draw pin method