Made changes to skeleton to fix previously mentioned issue