Version 0.0.3 - Use global functions