Warning temp fix
Updated init function