Re-Organised and created a wrapper