make it decently working