Small changes so it works better