Moved code to avoid erros