This needs to be solved such is better