Refactor, fixed perex load