Code

Updated focus handling