Updated to include my custom idea