Reworked for our needs